minor bug during merge - fixed