Attempting to fix the weird space/trigger mess