This should fix persistance exception