Fix for Crownpeak