Fix BZ 1008158
Fix BZ 999813