Fixing build; Potential fix for #487