Fixes #1356 - red background
Merge pull request #1628 from ATofighi/fix-1356

Fixes #1356 - red background