Modified to mitigate warnings.