Another tempfix to work with latest Caustic.