Revert "Fixing minor potential bug"

This reverts commit fb5cd6c3d7db4221b62eaf16bed36f5cdd21c7d3.