Model bug fixed