implemented enhancement #26