Fix breaking problem on breeze-ms-labs fork.  Reviewed by Piotr.