Resolved #21, added check for player target