Shayrai

I see a supposed fix was done in #799 but was moved to #808 but both have been closed. Is it just gonna be impossible for a while ( or...