Fixed #197