Readded type check