Fix Issue #2

(hopefully)