Another fix for issue #196