some bug fix after last push