Try to work around #8