bugfix + deprecation warning