Fix for Beta 6