Fix Andys problem