DZCP-Community/dzcp#5 Fix