Franken, fixes #496