First attempt to fix the stations bug #31