Fixed mod+f and mod+m