Small bug and reverse ordering