Updated version and tried to fix buffer issue