Fix to #4