Bugfix related to https://github.com/rikardq/rimi/issues/22