[#3098] Bugfix