syncing bug fix to dev