Fix for new ContentHandler code

Change-Id: If53759fedea337e418ad3801b48b47029779bff8