Hot Fix in Master v 1.1