Fixes BLD-1104

@adampalay @olmar