fix for currentTarget
merging changes from master