Fixed error introduced by merging changes