Last fix #38 and additaion check