#1213 - Fixed module dependencies