Fixes BLD-1104