Add fix to selection remaining bug