`IMPORTANT` pretty sure this is a bug, patch forthcoming in separate PR