global fixes, works ok !