! Add fix for issue #9