- Fixed source ordering bug