Fix new enhancement #45