Small bug fix for stability