Fixed for compatibility with new rufio core stuff