1.3.7 Bug Fix Issue #23