In order to work around #334