Not sure about removing this... I'd like to see the bug it was causing