Remove mixed configuration of another issues
a @hoatle please check again.