fixed weird collision issues