Revert "Revert "- really double values?""

This reverts commit c6ea9c8da7fa2af9498de27b69caa9a2efdc5903.