Fixed #592