* Fixed potential bug in features