Frame bugfix