I think that this handling can also go to method I mention above.