Fix for selection button