Anthony

Results 2 issues of Anthony

## Pull request checklist Please check if your PR fulfills the following requirements: - [x] Tests for the changes have been added (for bug fixes / features) - [ ]...