Fix #1 + init