Beta 6 quick fix