Fixed major corruption issue