Fixes https://github.com/adrianaisemberg/CLAP/issues/23