last fix; now works