This is a follow up for issue #178. There is an updated fix #180, please be so kind and merge it. Thanks!