fixed another minor bug due to last merge