FIX: added buffer object
FIX: buffer param
FIX: final fix