Fix as beaker client runs