Update #283 - Missing changes from refactor