fixing things that were lost in merge