Improve icase behavior