Begin to fix StringBuffer