Issue 18: another fix of format