Fixed #72