Fixed Issue #177
Fixed Issue #178