Check for issue #2. No problem... Fixes #2