fix 504; fix 086