fixed [BEAM-13]
fixed [BEAM-13] pt. 2