new API bugfixing