Checking in fix for #310