Removed a hack