Feature #1675, #1674