Changed to find by id instead of using .first and .last

Fixes #200