dafuq this sorting (fixes #31)