Final fix to the proper selector