Fix 9-15 bits are not properly handled