Fixed 'performance issues'