Fixing Bug.[#28]