both fixed :-D