Temporary test bugfix for #15