need to fix onStop for Frodo