Fix for cases where we have to push instead of open a new view controller