Revert "Minor bug fix"

This reverts commit 38d207c73a3706faac8f87620ba4fb085962b968.