Partial fix but still buggy