(WIP fix) working on commit fix