Cypress Fix #2