Revert "Fixed error in new feature"

This reverts commit 4afe5674a1af9a8b0f71411283549a0fdaebeca7.