a fix and moving out from schema evolution