quicfix for #2, needs testing