Applied bug-17 fix to master