bug module custom
Merge https://github.com/idiomaweb/af