Fix for folsom