Fixed #593