Addressed Jun's complain