Add force encoding check