Bugfix: correctly order data types