I realized this is a different issue than #28
I realized this is a different issue than #28