Applying suggested fix for [Issue #225]