Fixed behaviour now