make more strict (thanks @timoxley)