Fixed issue #2432. Also fixed for ED209 (had the same issue).
Merge pull request #2595 from GarrusVakarian/issue#2432fix

Fixed issue #2432. Also fixed for ED209 (had the same issue).