bug fix @Location