Small fix to handle initialization