DZCP-Community/dzcp#9 Fix