fixed that annoying rare case jan complained about a year ago