Issue #271 - Wait a bit before checking for class change