bugfix: Ambiguous class resolution