DZCP-Community/dzcp#6 Fix