Propose fix for 746, frame boundaries issues