Fixing runtime