A patch added to overcome encocing problems. However it requires a more redundant fix