D721 small bugfixing