Fixed #26