Bugfix to work around issue with REST API