Fix for CrownPeak