Resolves #533607495416