Some more bug fix