[[ Bug 13026 ]] Bugfix simplified to use MCcmd