Bugfix: compatibility with previous version was not working