Bug Fix: Validity resource