#601 - fix content replacement