Fixed container selection bug