fixed the never stopping call of Arrange