adapted patch #3050492 to new code