enhancement #40