Fixed issues with reusing Crop select