Also fix for issue #288