#567: #557: marks and margin positions fixed
opened by thuchacz