fixed https://github.com/Project60/sepa_dd/issues/158
fixed https://github.com/Project60/sepa_dd/issues/155