BugFix order on nil

Sorry @simplay this is not really a nice fix