Fixed issue with byte swapping in rd-vanilla (SP only)