Github/152/fix params again

The earlier fix was inadvertently reverted. This fixes it in a cleaner way.