Add coffee version
Fix bug