Bugfix from EddiVonDerAlm@1e83373