Fixing concurrancy issue in front-end.