fix weird object bug
cleanup