This fixes the issue that Pedro raised.