ishanjain28 and lfaraone Fix for #14