fixed feature handling