Partial fix for issue #1
Actually fix issue #1