Handle strict and bandaid some broken cases