Hot-fix <b>rhinestone</b>