re-fixed schema