patches fix to #13