sizing the image when the frame is set or you get weird behaviour
Merge commit 'bbfc168347f6fead0128e0f326fda5205c3e83ee'