Reverting module to previous working version and then adding chris's fix...

... back in