Temporary fix for issue #2170