Re-fix for issue #292