#497 fixes