Fixed stuff, @tattyseal can you check this with zate, it should still work after this commit