Merge #377 source change