Fix LP #1312700
Fix LP #1312791