FIXED: image overflow problem