workaround for builder2.js/issues/29