Fix enhancement #22 and #23