Fixed possible crash if that deallocs in the middle
Merge branch 'master' of github.com:marcoarment/FCModel