Fix for https://github.com/buildzoom/buildzoom/issues/1631