Fix from bad branch merge #3