seems an extension could help