fixes
not clean but working