Runtime Fix

Fixes #564