[*] Fixed constructor bug