Implemented workaround for #2071