WSOTWO-142: Fixed build