Further fix for #69
Further fix for #69

bartekhugo/FCModel,marcoarment/FCModel,iosphere/FCModel,lynns/FCModel,marcoarment/FCModel,lonelyplanet/FCModel,mirion/FCModel,Threadflip/FCModel,macressler/FCModel