Logic 'fixes' needs test