Fixing runtime issue