hum, awkward code fixed