Fixed buged where the order wasn't working as intended