Fix #473

#473