Added check on view presence