Fix #22, feature detect instead