Fix some terrible bug