bug fix to master