Bug Fix on 29th Oct