Runtime Fix
Merge pull request #570 from Ikarrus/fix564

Runtime Fix