Fixed third aspect mentioned by Pawel