added handler to fix wrong position bug