@jin trying to improve detection