fixing constructor