Fixed the overwriting issue