Bug fix for smacs