Fix #271 (for in-built schema generation)