weird bug with cleanup addressed