[#186] fix for modules too