Close #528