Band-aid fix for layout not running. Fix for real later...