some fixes for lovely Olya