Now works properly