Fix to #40