Added partial bugfix for #41