new version with bug on text layout