fixed a stupid bug
merge