Fix for SLM break