Fix for finish customer