Added the solution mentioned in patch #3125