Fixed getting the right features out