Develop hot fix