Card #83

https://trello.com/c/apoFOY9H/83-upgrade-and-fix-finder

fix castings