patch to beta 36