Should Fix issue #3