Added temporary fix for IsReady problems