Fixed bug 907224. No tests

No tests case yet. Will add if possible.