fixed properly