#293. Minor changes in modules.