Fix different bug