Fix #5928

@basepi, this needs to be in 0.16.1