fix for Beta 6