bug fixes with right click