Fix for issue #267