Issue/sciphone 1208 2

@paultiarks