Fix for infinite loop - wrongly overriden a fix from library.