Fixed #253