adding patch #1211278