Fix #1548

CC #1549 

@emackey please review/merge this.