Issue 1170

@antgonza, are you available to review this one?