Fix Issue #184

Fix Issues #184 #189