Bug fix & use same format