[#291] fixes