Fixed __init__ bug once and for all