Fixed arrangement bug