fixed yet another bug
merge