Code

Hopefully fix for the recently experienced crashes when building with -O2. I don...