resolved feature 1231