Fix issue #27
Fix issue #27