Fixed first aspect mentioned by Pawel