Fix for Beta 4