improvement: make a workaround for bug #16 optional