fix for warning and content overlapping