global bug-fix