Slightly better way to handle the hack...