Bugfix: revert the last changes