Fixes compatibility issues with Foundry release 0.5.5.
Backward compatibility to foundry version prior to 0.5.5