Fixing the broken Moped dependency [ #2686 ]