Fixed Issue #58