fast fix for features