Commit for Pekka's Mac related bounding box issue