Tweak for issue #109