Fixed bug caused by fix for Issue #36