Fixed for new rust, now used untyped traits