Fix to #250