andrews clever fix