Cleanup the last little fix