bug fix related to just born feature