Removed array check to eliminate linking error