Issue #159 - add extra validation