Should fix AN-354 and AN-364

we'll see……