Another patch to beta 36