More type-checking. A bit faster