Possibly fix #499