May 27 CSFP fix (940/1776):