Fix for Sunrise change