BUGFIX: deprecation warnings