issue fix #11
Piol QA