Fixing frame management issue