Make sure we dont crap on other attributes on handlers