Fix enhancement #24