Test & Fix for issue #62