BUGFIX: uncommitted helper module