partial fix 1c scenario