Where's My Helmet?: Bug fixes

Bug fix for performance improvement