yet another fix (bug yet-another-fix)