Fix scallop parsing