Temporary, partial fix for performance issues