Fix for https://github.com/DZCP-Community/dzcp/issues/53