Small fix to issue on some boxes