Fixed #43