Fixed code erronously in develop branch
Revert "Fixed code erronously in develop branch"

This reverts commit 1018bf9e1509353d286f7b8605c0522cc415cf94.
bugfix