Fixed key bug