Fixed #249