Bug fix.
Fix spelling
Optimization: don't use ByteBuffer