Fix target catching