fix enhancement #5