helping fix justins github issues