Fix this craziness