Fixing 5.2 compatibility: #53