little fix before continue writing, merge Jo file from master