remove exception, introduced with content handler merge