Bugfix: some methods needed delegation