Fixed issue #5, order not takein into account

- Now should work properly