fix modules and timer