Fixes CS-4619, as reported by Ruslan, thanks!