Minor bug fix: instead of relying on the initialization