Fixed little bug when assigning default values