DZCP-Community/dzcp#7 Fix