Fixed #36. Updated validation process