// Fix for Performance issue