Fix for PR139