Bug fix for alpha
Bug fix 2 for alpha