Fix for kindlegen