Tweaked runtime should be ok now