Schema calls fix