Issue #56

Simple fix for Issue #56