fixed a bug from asana task
merge fix