Fix for PR