Fixed issues with enhancing