[[ Bug 13026 ]] Bugfix added in 7.0