Fixed logics

Signed-off-by: shyeon.kim <kimseo@kth.se>