Fixes #1 - use catchAll