Removed default value check