#2511 and #2518