Fixed issue: Fixed schema in previous commit