Small bugfix for core part of #82