fixed for moped 2.0.0, seems to work\!