One more change, this time for 16-bit operations.