Fix to #8