CHRON-50 fix