Beta 9 fix