reverted to original form bug. Lesser of two evils