Implement #526