#9: fix modules errors