handle pre-stopped edge case better
remove .only