Noticed a bug for fix #180 #189. Hope this will fix it.