Init fix #1