Fixing reservation problems (#71)