Fixes major bug