Fix issue regarding the code selection