Fix to #46