fixing broken features