Bug fixed: Change constructor name