Line 247 fix