fixes for Katya