potential fix for DESK 6493