Feature/fix 404

Fixes #402