Fix for Beta 5