DZCP-Community/dzcp#3 Fix 2