fixed issue with previous improvement