Fixes sorting problem in #184

Quickfix..
Should really really be discussed and worked+tested