Added hot fix