Made type checking more leanient