Created a patch for the module code. Not sure if that works please review.