Additional tweak and test