Fix for Uberfire change