Fixes #123
Using removed