Fix #52.2