Temp fix for Pull #2