Bugfix in compatibility