Still not working, but trying another fix for #465