Fixing (potential) apgendassertion bub