Revert "Revert "merge""

This reverts commit 629e4a4c54791c644b19ceb81faae86b7042c80d.
minor bug fix