Slightly more strict checking