#5 Now works properly.