Fixed logical validation bug