Fix header formatting
Fix crash