Close #504