hotfix to module 1a in master