add extra validation #54