Bug fix for issue #15

Bug fix for issue #15