Fixes.(thank you saalazar and cqqjjf)