Another id 0 fix
Code style