Fix multiple entry problem for the tray