Fixed issue with previous tweaks