little bug fix
fixed another bug caused by merge