Small bug due to Hierarchical modules

First bug due to hierarchical modules? :wink:
drop this, the block of code below already handles this for 4.1.1 and 5.0.1