Fixing constructor