Fixes #41: Order entries by position