[#4713] Bugfix