Calculated attributes & actions callback fix