Fix from bad branch merge #2