Fix for rw API change