Trying to see if I can come up with a solution without modifying the module :)