fixing previous issue