Resubmitting workaround for #143

This bug still exists, hence resubmitting workaround proposed earlier by others.