Fix for bug #1

Fixes bug #1.