fix to use Target object strictly
v0.0.15