Fix with Moped module