Fixes Issue #54

Fixes Issue #54