Fixed #256