fixed after Vitaliy's review