Ugly fix for strange layout bug