enhancement #116