merge saku patch from caramelopardalis: https://github.com/shingetsu/saku/commit/982c14ec7c0cabef96c2d46ace7aaa26541762ba