committed fixed to remaining modules