fixed ordering issue, as suggested by @ashimshahi