Fix === issues, fix #257