Pre-bug fix code