This sucks, change it