Fix for #7

Fix for bug #7