Fix speciticity issue