before merge
angular compiler fixed