multilple fixes