Small improvement #60