Fixed #501