hackfix for #176