Fix for 2.0 implementation.