Added correct handling