Partly fix for broken API