Fixed wrong constructor calls (just again...)