More attempt to work around #275