+ fixes first half of #72