Class header fix
Fix start position check