Fixed to use proper constructor