Fixed (#21) and probably (#14)