Quick fix for issue #26