Fixes #1338 - Extend limits - Companion