fixed broken features