minor bug fix
Revert "minor bug fix"

This reverts commit 74cf3484c12081274b3dbf04243321cb977103a8.
Merge remote-tracking branch 'origin/master'