Corrected Gasperotti's Bug 20141101 and 20141103