Fix for issue #265