fixed issue with schemas