Successfully resolve scope type issues
Adding edge case for later