this should work, fix is merged