Fixed #577