Fixing Issue when caging pets. Should finally address reports #26 and #31.