selector review. fix #33