Fixed Gasperotti's Bug 20141029