Fixed is_ready logic