Fixed overwriting one bug