Fixes bug from refactoring typedef