Runtime fix
Attempt at fixing redmine #206 - You can eat your implants