Fix for SASL