Trying to squash a bug... See issue #1