Related template fix