Issue #40 fix for broken test