Init fix #4