Fix constructor problem