Added return to stop model.js from doing unneeded calculations

This was meant to be there already, but was overlooked.
Merge branch 'fixMath' into devel