Trying to fix issues with new feature detector.. :/