Fixed Issue #36