Bug #915: Solved!