Detect returns slightly differently, Fixes #34