Fixed issue when coming from custom view