Fix bugg