Improve detection