Attempting to fix staggering issue