Addressing #1427, #1437, #1433