Apply Andrey's suggestion