Parser fix, more hair