will see if this takes care of #128