Fixing things broken by ISSUE #55