Quickfix for 696

Does not apply to 2.2 due to Attila's rewrite of the module

Fixes #696