Fix - validation