Bugfix/backward compability