Make the hack less of a hack