Runtime fix
Merge pull request #301 from ZomgPonies/master

Runtime fix