Respect sort order
Version 0.4.0