Bugfix interface