Yet another fix for the width issue