At module

It seems that part of this was merged but not everything.

Tested via:
https://gist.github.com/risaacson/095b460e858d4de48f77