Updated to fix bug with current beta 2 nil attributes feature