fixed now finally