Partial sunny fix