Fixed Case #149 and 150