Another attempt at removing warning