fixes, thanks mr. morin