reverting back, previous 'fix' made it worse