Workaround for issue# 12961.