bug fix for dev branch