Change: Conversion strategy
Bug: wrong alignment in numeric operations
Change: Conversion strategy