Fix for issue #288