quick fixes (Still doesn't work)