Beta 2 fix update