(A1) Common bug fix