Fixes module change - 1.0.21