Updated handling of the modifed to take valid argument

close #12