Manual fix for issue #1119