Attempt for a quickfix of the double bug