[[ Bugfix 13580 ]] Slightly different approach