added a todo to get rid of this "handy" trick