more sanghoun's fixes