Tried to fix bug, todo tmr