WIP big fix
Fixed carryover partial bug from another branch