Re #1396 - Fixes