Fixed issue with previous commit