Updated fix for frame sizing problem in issue #1636