Fixed long standing warning