Fix for Beta4