Fix #108, workaround for #109