diff --git a/kamera_server.py b/kamera_server.py
index 125f8fc..bebf43e 100644
--- a/kamera_server.py
+++ b/kamera_server.py
@@ -36,9 +36,10 @@ def main():
 @kamera_server.route("/<changePin>/<action>")
 def action(changePin, action):
     # Convert the pin from the URL into an integer:
-    changePin = int(changePin)
+    
     # Get the device name for the pin being changed:
     deviceName = pins_out[changePin]['name']
+    changePin = pins_out[changePin]['nr']
     # If the action part of the URL is "on," execute the code indented below:
     if action == "on":
         # Set the pin high:
diff --git a/templates/main.html b/templates/main.html
index 1a6c549..4964e34 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -14,10 +14,10 @@
    <h2>{{ pins[pin].name }}
    {% if pins[pin].state == true %}
       ist gerade <strong>an</strong></h2><div class="row"><div class="col-md-2">
-      <a href="/{{pins[pin].nr}}/off" class="btn btn-block btn-lg btn-default" role="button">Turn off</a></div></div>
+      <a href="/{{pin}}/off" class="btn btn-block btn-lg btn-default" role="button">Turn off</a></div></div>
    {% else %}
       ist gerade <strong>aus</strong></h2><div class="row"><div class="col-md-2">
-      <a href="/{{pins[pin].nr}}/on" class="btn btn-block btn-lg btn-primary" role="button">Turn on</a></div></div>
+      <a href="/{{pin}}/on" class="btn btn-block btn-lg btn-primary" role="button">Turn on</a></div></div>
    {% endif %}
    {% endfor %}
    {% for pin in pins_in %}