Fast bug fix
Revert "Fast bug fix"

This reverts commit 6306d0bc79ccff2b8a3d315fc7c6741458b6dfa6.
hotfix
conflict merge master and 1.0_rel