Fixed #281