QAART-368 Fixing the issue with frame not switching properly