bufixing, still broken