Fixed build process

Fixed failing build process after submitted SUREFIRE-1082.