Temporary fix for the Lorikeet WS bug