Fixed frame-related bug