t680 -- Fixed issues with modules starts with P