fixed bug introduced in last commit
even if original issue is fixed, result is better with this one, I will keep it