Changed order according to unit-test feedback