New upcoming image should have a number of fixes for issues like this.