fixes @lukemelia / @kselden