couple weird cases added