Fixed breakage (issue #1)