Fixes #138
Related to genodelabs/genode#3101
Imported from genode repository Issue genodelabs/genode#3100