Fixed bug 10581, thanks to S7.