Fix for the performance improvement: Clone abstractions where necessary