fixed schema suppoer