reorder sources #291