working but hacked around - fix