Fix for efficiency issues