Now working for normal cases.