Temporary remove buggy function