Fixed #726