Maybe fix signatures for #16 this time