[Feature] Hot fix