fix annoying issue