Fixing a dirty, dirty hack