finally handling non-extensions properly-ish