Fixed issue where  wasn't always using the correct superview